From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 9 Jul 2009 07:52:31 +0000 (+0100)
Subject: x86_64: Fix Xen relocation size -- there is no longer an allocation
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13626
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=6edab9fe64689945d4c8124442b76ae7d09406f8;p=xen.git

x86_64: Fix Xen relocation size -- there is no longer an allocation
bitmap to account for.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 0793a74a85..b7966dfd63 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -646,8 +646,7 @@ void __init __start_xen(unsigned long mbi_p)
             s >> PAGE_SHIFT, (e-s) >> PAGE_SHIFT, PAGE_HYPERVISOR);
 
 #if defined(CONFIG_X86_64)
-/* Relocate Xen image, allocation bitmap, and one page of padding. */
-#define reloc_size ((__pa(&_end) + max_page/8 + PAGE_SIZE + mask) & ~mask)
+#define reloc_size ((__pa(&_end) + mask) & ~mask)
         /* Is the region suitable for relocating Xen? */
         if ( !xen_phys_start && ((e-s) >= reloc_size) )
         {